include $(TOPDIR)/rules.mk
PKG_NAME:=php
-PKG_VERSION:=8.3.14
+PKG_VERSION:=8.4.5
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.php.net/distributions/
-PKG_HASH:=58b4cb9019bf70c0cbcdb814c7df79b9065059d14cf7dbf48d971f8e56ae9be7
+PKG_HASH:=0d3270bbce4d9ec617befce52458b763fd461d475f1fe2ed878bb8573faed327
PKG_BUILD_PARALLEL:=1
PKG_BUILD_FLAGS:=no-mips16
exif \
fileinfo filter ftp \
gettext gd gmp \
- iconv imap intl \
+ iconv intl \
ldap \
mbstring mysqli mysqlnd \
opcache openssl \
CONFIGURE_ARGS+= --without-iconv
endif
-ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-imap),)
- CONFIGURE_ARGS+= \
- --with-imap=shared,"$(STAGING_DIR)/usr" \
- --with-kerberos=no \
- --with-imap-ssl="$(STAGING_DIR)/usr"
-else
- CONFIGURE_ARGS+= --without-imap
-endif
-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-intl),)
CONFIGURE_ARGS+= --enable-intl=shared
else
CONFIGURE_ARGS+= --disable-opcache
endif
-ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-openssl)$(CONFIG_PACKAGE_php8-mod-ftp)$(CONFIG_PACKAGE_php8-mod-imap)$(CONFIG_PACKAGE_php8-mod-snmp),)
+ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-openssl)$(CONFIG_PACKAGE_php8-mod-ftp)$(CONFIG_PACKAGE_php8-mod-snmp),)
CONFIGURE_ARGS+= \
--with-openssl=shared \
--with-kerberos=no \
$(eval $(call BuildModule,gettext,Gettext,+PACKAGE_php8-mod-gettext:libintl-full))
$(eval $(call BuildModule,gmp,GMP,+PACKAGE_php8-mod-gmp:libgmp))
$(eval $(call BuildModule,iconv,iConv,$(ICONV_DEPENDS)))
-$(eval $(call BuildModule,imap,IMAP,+PACKAGE_php8-mod-imap:libopenssl +PACKAGE_libpam:libpam +PACKAGE_php8-mod-imap:uw-imap))
$(eval $(call BuildModule,intl,Internationalization Functions,+PACKAGE_php8-mod-intl:icu +PHP8_FULLICUDATA:icu-full-data))
$(eval $(call BuildModule,ldap,LDAP,+PACKAGE_php8-mod-ldap:libopenldap +PACKAGE_php8-mod-ldap:libsasl2))
$(eval $(call BuildModule,mbstring,MBString,+PACKAGE_php8-mod-mbstring:oniguruma))
; Error handling and logging ;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-error_reporting = E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT
+error_reporting = E_ALL & ~E_NOTICE & ~E_DEPRECATED
display_errors = On
display_startup_errors = Off
log_errors = Off
--- /dev/null
+Date: Wed, 25 Aug 2021 16:47:17 +0200
+Subject: Add-support-for-use-of-the-system-timezone-database
+
+# License: MIT
+# http://opensource.org/licenses/MIT
+
+# License: MIT
+# http://opensource.org/licenses/MIT
+
+Add support for use of the system timezone database, rather
+than embedding a copy. Discussed upstream but was not desired.
+
+History:
+r21: adapt for timelib 2021.03 (in 8.1.0)
+r20: adapt for timelib 2020.03 (in 8.0.10RC1)
+r19: adapt for timelib 2020.02 (in 8.0.0beta2)
+r18: adapt for autotool change in 7.3.3RC1
+r17: adapt for timelib 2018.01 (in 7.3.2RC1)
+r16: adapt for timelib 2017.06 (in 7.2.3RC1)
+r15: adapt for timelib 2017.05beta7 (in 7.2.0RC1)
+r14: improve check for valid tz file
+r13: adapt for upstream changes to use PHP allocator
+r12: adapt for upstream changes for new zic
+r11: use canonical names to avoid more case sensitivity issues
+ round lat/long from zone.tab towards zero per builtin db
+r10: make timezone case insensitive
+r9: fix another compile error without --with-system-tzdata configured (Michael Heimpold)
+r8: fix compile error without --with-system-tzdata configured
+r7: improve check for valid timezone id to exclude directories
+r6: fix fd leak in r5, fix country code/BC flag use in
+ timezone_identifiers_list() using system db,
+ fix use of PECL timezonedb to override system db,
+r5: reverts addition of "System/Localtime" fake tzname.
+ updated for 5.3.0, parses zone.tab to pick up mapping between
+ timezone name, country code and long/lat coords
+r4: added "System/Localtime" tzname which uses /etc/localtime
+r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
+r2: add filesystem trawl to set up name alias index
+r1: initial revision
+---
+ ext/date/config0.m4 | 13 ++
+ ext/date/lib/parse_tz.c | 535 +++++++++++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 545 insertions(+), 3 deletions(-)
+
+--- a/ext/date/config0.m4
++++ b/ext/date/config0.m4
+@@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h])
+ dnl Check for strtoll, atoll
+ AC_CHECK_FUNCS([strtoll atoll])
+
++PHP_ARG_WITH(system-tzdata, for use of system timezone data,
++[ --with-system-tzdata[=DIR] to specify use of system timezone data],
++no, no)
++
++if test "$PHP_SYSTEM_TZDATA" != "no"; then
++ AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used])
++
++ if test "$PHP_SYSTEM_TZDATA" != "yes"; then
++ AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
++ [Define for location of system timezone data])
++ fi
++fi
++
+ AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough],
+ [PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"],,
+ [-Werror])
+--- a/ext/date/lib/parse_tz.c
++++ b/ext/date/lib/parse_tz.c
+@@ -26,9 +26,22 @@
+ #include "timelib.h"
+ #include "timelib_private.h"
+
++#ifdef HAVE_SYSTEM_TZDATA
++#include <sys/mman.h>
++#include <sys/stat.h>
++#include <limits.h>
++#include <fcntl.h>
++#include <unistd.h>
++
++#include "php_scandir.h"
++
++#else
+ #define TIMELIB_SUPPORTS_V2DATA
+ #define TIMELIB_SUPPORT_SLIM_FILE
+ #include "timezonedb.h"
++#endif
++
++#include <ctype.h>
+
+ #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
+ # if defined(__LITTLE_ENDIAN__)
+@@ -95,6 +108,11 @@ static int read_php_preamble(const unsig
+ {
+ uint32_t version;
+
++ if (memcmp(*tzf, "TZif", 4) == 0) {
++ *tzf += 20;
++ return 0;
++ }
++
+ /* read ID */
+ version = (*tzf)[3] - '0';
+ *tzf += 4;
+@@ -577,7 +595,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
+ }
+ }
+
+-static int seek_to_tz_position(const unsigned char **tzf, const char *timezone, const timelib_tzdb *tzdb)
++#ifdef HAVE_SYSTEM_TZDATA
++
++#ifdef HAVE_SYSTEM_TZDATA_PREFIX
++#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX
++#else
++#define ZONEINFO_PREFIX "/usr/share/zoneinfo"
++#endif
++
++/* System timezone database pointer. */
++static const timelib_tzdb *timezonedb_system;
++
++/* Hash table entry for the cache of the zone.tab mapping table. */
++struct location_info {
++ char code[2];
++ double latitude, longitude;
++ char name[64];
++ char *comment;
++ struct location_info *next;
++};
++
++/* Cache of zone.tab. */
++static struct location_info **system_location_table;
++
++/* Size of the zone.tab hash table; a random-ish prime big enough to
++ * prevent too many collisions. */
++#define LOCINFO_HASH_SIZE (1021)
++
++/* Compute a case insensitive hash of str */
++static uint32_t tz_hash(const char *str)
++{
++ const unsigned char *p = (const unsigned char *)str;
++ uint32_t hash = 5381;
++ int c;
++
++ while ((c = tolower(*p++)) != '\0') {
++ hash = (hash << 5) ^ hash ^ c;
++ }
++
++ return hash % LOCINFO_HASH_SIZE;
++}
++
++/* Parse an ISO-6709 date as used in zone.tab. Returns end of the
++ * parsed string on success, or NULL on parse error. On success,
++ * writes the parsed number to *result. */
++static char *parse_iso6709(char *p, double *result)
++{
++ double v, sign;
++ char *pend;
++ size_t len;
++
++ if (*p == '+')
++ sign = 1.0;
++ else if (*p == '-')
++ sign = -1.0;
++ else
++ return NULL;
++
++ p++;
++ for (pend = p; *pend >= '0' && *pend <= '9'; pend++)
++ ;;
++
++ /* Annoying encoding used by zone.tab has no decimal point, so use
++ * the length to determine the format:
++ *
++ * 4 = DDMM
++ * 5 = DDDMM
++ * 6 = DDMMSS
++ * 7 = DDDMMSS
++ */
++ len = pend - p;
++ if (len < 4 || len > 7) {
++ return NULL;
++ }
++
++ /* p => [D]DD */
++ v = (p[0] - '0') * 10.0 + (p[1] - '0');
++ p += 2;
++ if (len == 5 || len == 7)
++ v = v * 10.0 + (*p++ - '0');
++ /* p => MM[SS] */
++ v += (10.0 * (p[0] - '0')
++ + p[1] - '0') / 60.0;
++ p += 2;
++ /* p => [SS] */
++ if (len > 5) {
++ v += (10.0 * (p[0] - '0')
++ + p[1] - '0') / 3600.0;
++ p += 2;
++ }
++
++ /* Round to five decimal place, not because it's a good idea,
++ * but, because the builtin data uses rounded data, so, match
++ * that. */
++ *result = trunc(v * sign * 100000.0) / 100000.0;
++
++ return p;
++}
++
++/* This function parses the zone.tab file to build up the mapping of
++ * timezone to country code and geographic location, and returns a
++ * hash table. The hash table is indexed by the function:
++ *
++ * tz_hash(timezone-name)
++ */
++static struct location_info **create_location_table(void)
++{
++ struct location_info **li, *i;
++ char zone_tab[PATH_MAX];
++ char line[512];
++ FILE *fp;
++
++ strncpy(zone_tab, ZONEINFO_PREFIX "/zone.tab", sizeof zone_tab);
++
++ fp = fopen(zone_tab, "r");
++ if (!fp) {
++ return NULL;
++ }
++
++ li = calloc(LOCINFO_HASH_SIZE, sizeof *li);
++
++ while (fgets(line, sizeof line, fp)) {
++ char *p = line, *code, *name, *comment;
++ uint32_t hash;
++ double latitude, longitude;
++
++ while (isspace(*p))
++ p++;
++
++ if (*p == '#' || *p == '\0' || *p == '\n')
++ continue;
++
++ if (!isalpha(p[0]) || !isalpha(p[1]) || p[2] != '\t')
++ continue;
++
++ /* code => AA */
++ code = p;
++ p[2] = 0;
++ p += 3;
++
++ /* coords => [+-][D]DDMM[SS][+-][D]DDMM[SS] */
++ p = parse_iso6709(p, &latitude);
++ if (!p) {
++ continue;
++ }
++ p = parse_iso6709(p, &longitude);
++ if (!p) {
++ continue;
++ }
++
++ if (!p || *p != '\t') {
++ continue;
++ }
++
++ /* name = string */
++ name = ++p;
++ while (*p != '\t' && *p && *p != '\n')
++ p++;
++
++ *p++ = '\0';
++
++ /* comment = string */
++ comment = p;
++ while (*p != '\t' && *p && *p != '\n')
++ p++;
++
++ if (*p == '\n' || *p == '\t')
++ *p = '\0';
++
++ hash = tz_hash(name);
++ i = malloc(sizeof *i);
++ memcpy(i->code, code, 2);
++ strncpy(i->name, name, sizeof i->name);
++ i->comment = strdup(comment);
++ i->longitude = longitude;
++ i->latitude = latitude;
++ i->next = li[hash];
++ li[hash] = i;
++ /* printf("%s [%u, %f, %f]\n", name, hash, latitude, longitude); */
++ }
++
++ fclose(fp);
++
++ return li;
++}
++
++/* Return location info from hash table, using given timezone name.
++ * Returns NULL if the name could not be found. */
++const struct location_info *find_zone_info(struct location_info **li,
++ const char *name)
++{
++ uint32_t hash = tz_hash(name);
++ const struct location_info *l;
++
++ if (!li) {
++ return NULL;
++ }
++
++ for (l = li[hash]; l; l = l->next) {
++ if (timelib_strcasecmp(l->name, name) == 0)
++ return l;
++ }
++
++ return NULL;
++}
++
++/* Filter out some non-tzdata files and the posix/right databases, if
++ * present. */
++static int index_filter(const struct dirent *ent)
++{
++ return strcmp(ent->d_name, ".") != 0
++ && strcmp(ent->d_name, "..") != 0
++ && strcmp(ent->d_name, "posix") != 0
++ && strcmp(ent->d_name, "posixrules") != 0
++ && strcmp(ent->d_name, "right") != 0
++ && strstr(ent->d_name, ".list") == NULL
++ && strstr(ent->d_name, ".tab") == NULL;
++}
++
++static int sysdbcmp(const void *first, const void *second)
++{
++ const timelib_tzdb_index_entry *alpha = first, *beta = second;
++
++ return timelib_strcasecmp(alpha->id, beta->id);
++}
++
++
++/* Create the zone identifier index by trawling the filesystem. */
++static void create_zone_index(timelib_tzdb *db)
++{
++ size_t dirstack_size, dirstack_top;
++ size_t index_size, index_next;
++ timelib_tzdb_index_entry *db_index;
++ char **dirstack;
++
++ /* LIFO stack to hold directory entries to scan; each slot is a
++ * directory name relative to the zoneinfo prefix. */
++ dirstack_size = 32;
++ dirstack = malloc(dirstack_size * sizeof *dirstack);
++ dirstack_top = 1;
++ dirstack[0] = strdup("");
++
++ /* Index array. */
++ index_size = 64;
++ db_index = malloc(index_size * sizeof *db_index);
++ index_next = 0;
++
++ do {
++ struct dirent **ents;
++ char name[PATH_MAX], *top;
++ int count;
++
++ /* Pop the top stack entry, and iterate through its contents. */
++ top = dirstack[--dirstack_top];
++ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top);
++
++ count = php_scandir(name, &ents, index_filter, php_alphasort);
++
++ while (count > 0) {
++ struct stat st;
++ const char *leaf = ents[count - 1]->d_name;
++
++ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s",
++ top, leaf);
++
++ if (strlen(name) && stat(name, &st) == 0) {
++ /* Name, relative to the zoneinfo prefix. */
++ const char *root = top;
++
++ if (root[0] == '/') root++;
++
++ snprintf(name, sizeof name, "%s%s%s", root,
++ *root ? "/": "", leaf);
++
++ if (S_ISDIR(st.st_mode)) {
++ if (dirstack_top == dirstack_size) {
++ dirstack_size *= 2;
++ dirstack = realloc(dirstack,
++ dirstack_size * sizeof *dirstack);
++ }
++ dirstack[dirstack_top++] = strdup(name);
++ }
++ else {
++ if (index_next == index_size) {
++ index_size *= 2;
++ db_index = realloc(db_index,
++ index_size * sizeof *db_index);
++ }
++
++ db_index[index_next++].id = strdup(name);
++ }
++ }
++
++ free(ents[--count]);
++ }
++
++ if (count != -1) free(ents);
++ free(top);
++ } while (dirstack_top);
++
++ qsort(db_index, index_next, sizeof *db_index, sysdbcmp);
++
++ db->index = db_index;
++ db->index_size = index_next;
++
++ free(dirstack);
++}
++
++#define FAKE_HEADER "1234\0??\1??"
++#define FAKE_UTC_POS (7 - 4)
++
++/* Create a fake data segment for database 'sysdb'. */
++static void fake_data_segment(timelib_tzdb *sysdb,
++ struct location_info **info)
++{
++ size_t n;
++ char *data, *p;
++
++ data = malloc(3 * sysdb->index_size + 7);
++
++ p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1);
++
++ for (n = 0; n < sysdb->index_size; n++) {
++ const struct location_info *li;
++ timelib_tzdb_index_entry *ent;
++
++ ent = (timelib_tzdb_index_entry *)&sysdb->index[n];
++
++ /* Lookup the timezone name in the hash table. */
++ if (strcmp(ent->id, "UTC") == 0) {
++ ent->pos = FAKE_UTC_POS;
++ continue;
++ }
++
++ li = find_zone_info(info, ent->id);
++ if (li) {
++ /* If found, append the BC byte and the
++ * country code; set the position for this
++ * section of timezone data. */
++ ent->pos = (p - data) - 4;
++ *p++ = '\1';
++ *p++ = li->code[0];
++ *p++ = li->code[1];
++ }
++ else {
++ /* If not found, the timezone data can
++ * point at the header. */
++ ent->pos = 0;
++ }
++ }
++
++ sysdb->data = (unsigned char *)data;
++}
++
++/* Returns true if the passed-in stat structure describes a
++ * probably-valid timezone file. */
++static int is_valid_tzfile(const struct stat *st, int fd)
++{
++ if (fd) {
++ char buf[20];
++ if (read(fd, buf, 20)!=20) {
++ return 0;
++ }
++ lseek(fd, SEEK_SET, 0);
++ if (memcmp(buf, "TZif", 4)) {
++ return 0;
++ }
++ }
++ return S_ISREG(st->st_mode) && st->st_size > 20;
++}
++
++/* To allow timezone names to be used case-insensitively, find the
++ * canonical name for this timezone, if possible. */
++static const char *canonical_tzname(const char *timezone)
++{
++ if (timezonedb_system) {
++ timelib_tzdb_index_entry *ent, lookup;
++
++ lookup.id = (char *)timezone;
++
++ ent = bsearch(&lookup, timezonedb_system->index,
++ timezonedb_system->index_size, sizeof lookup,
++ sysdbcmp);
++ if (ent) {
++ return ent->id;
++ }
++ }
++
++ return timezone;
++}
++
++/* Return the mmap()ed tzfile if found, else NULL. On success, the
++ * length of the mapped data is placed in *length. */
++static char *map_tzfile(const char *timezone, size_t *length)
++{
++ char fname[PATH_MAX];
++ struct stat st;
++ char *p;
++ int fd;
++
++ if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) {
++ return NULL;
++ }
++
++ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", canonical_tzname(timezone));
++
++ fd = open(fname, O_RDONLY);
++ if (fd == -1) {
++ return NULL;
++ } else if (fstat(fd, &st) != 0 || !is_valid_tzfile(&st, fd)) {
++ close(fd);
++ return NULL;
++ }
++
++ *length = st.st_size;
++ p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
++ close(fd);
++
++ return p != MAP_FAILED ? p : NULL;
++}
++
++#endif
++
++static int inmem_seek_to_tz_position(const unsigned char **tzf, const char *timezone, const timelib_tzdb *tzdb)
+ {
+ int left = 0, right = tzdb->index_size - 1;
+
+@@ -603,9 +1043,48 @@ static int seek_to_tz_position(const uns
+ return 0;
+ }
+
++static int seek_to_tz_position(const unsigned char **tzf, const char *timezone,
++ char **map, size_t *maplen,
++ const timelib_tzdb *tzdb)
++{
++#ifdef HAVE_SYSTEM_TZDATA
++ if (tzdb == timezonedb_system) {
++ char *orig;
++
++ orig = map_tzfile(timezone, maplen);
++ if (orig == NULL) {
++ return 0;
++ }
++
++ (*tzf) = (unsigned char *)orig;
++ *map = orig;
++ return 1;
++ }
++ else
++#endif
++ {
++ return inmem_seek_to_tz_position(tzf, timezone, tzdb);
++ }
++}
++
+ const timelib_tzdb *timelib_builtin_db(void)
+ {
++#ifdef HAVE_SYSTEM_TZDATA
++ if (timezonedb_system == NULL) {
++ timelib_tzdb *tmp = malloc(sizeof *tmp);
++
++ tmp->version = "0.system";
++ tmp->data = NULL;
++ create_zone_index(tmp);
++ system_location_table = create_location_table();
++ fake_data_segment(tmp, system_location_table);
++ timezonedb_system = tmp;
++ }
++
++ return timezonedb_system;
++#else
+ return &timezonedb_builtin;
++#endif
+ }
+
+ const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count)
+@@ -617,7 +1096,30 @@ const timelib_tzdb_index_entry *timelib_
+ int timelib_timezone_id_is_valid(const char *timezone, const timelib_tzdb *tzdb)
+ {
+ const unsigned char *tzf;
+- return (seek_to_tz_position(&tzf, timezone, tzdb));
++
++#ifdef HAVE_SYSTEM_TZDATA
++ if (tzdb == timezonedb_system) {
++ char fname[PATH_MAX];
++ struct stat st;
++
++ if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) {
++ return 0;
++ }
++
++ if (system_location_table) {
++ if (find_zone_info(system_location_table, timezone) != NULL) {
++ /* found in cache */
++ return 1;
++ }
++ }
++
++ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", canonical_tzname(timezone));
++
++ return stat(fname, &st) == 0 && is_valid_tzfile(&st, 0);
++ }
++#endif
++
++ return (inmem_seek_to_tz_position(&tzf, timezone, tzdb));
+ }
+
+ static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
+@@ -662,6 +1164,8 @@ static timelib_tzinfo* timelib_tzinfo_ct
+ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code)
+ {
+ const unsigned char *tzf;
++ char *memmap = NULL;
++ size_t maplen;
+ timelib_tzinfo *tmp;
+ int version;
+ int transitions_result, types_result;
+@@ -669,7 +1173,7 @@ timelib_tzinfo *timelib_parse_tzfile(con
+
+ *error_code = TIMELIB_ERROR_NO_ERROR;
+
+- if (seek_to_tz_position(&tzf, timezone, tzdb)) {
++ if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) {
+ tmp = timelib_tzinfo_ctor(timezone);
+
+ version = read_preamble(&tzf, tmp, &type);
+@@ -712,11 +1216,36 @@ timelib_tzinfo *timelib_parse_tzfile(con
+ return NULL;
+ }
+
++#ifdef HAVE_SYSTEM_TZDATA
++ if (memmap) {
++ const struct location_info *li;
++
++ /* TZif-style - grok the location info from the system database,
++ * if possible. */
++
++ if ((li = find_zone_info(system_location_table, timezone)) != NULL) {
++ tmp->location.comments = timelib_strdup(li->comment);
++ strncpy(tmp->location.country_code, li->code, 2);
++ tmp->location.longitude = li->longitude;
++ tmp->location.latitude = li->latitude;
++ tmp->bc = 1;
++ }
++ else {
++ set_default_location_and_comments(&tzf, tmp);
++ }
++
++ /* Now done with the mmap segment - discard it. */
++ munmap(memmap, maplen);
++ } else {
++#endif
+ if (type == TIMELIB_TZINFO_PHP) {
+ read_location(&tzf, tmp);
+ } else {
+ set_default_location_and_comments(&tzf, tmp);
+ }
++#ifdef HAVE_SYSTEM_TZDATA
++ }
++#endif
+ } else {
+ *error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE;
+ tmp = NULL;
+++ /dev/null
-Date: Wed, 25 Aug 2021 16:47:17 +0200
-Subject: Add-support-for-use-of-the-system-timezone-database
-
-# License: MIT
-# http://opensource.org/licenses/MIT
-
-# License: MIT
-# http://opensource.org/licenses/MIT
-
-Add support for use of the system timezone database, rather
-than embedding a copy. Discussed upstream but was not desired.
-
-History:
-r21: adapt for timelib 2021.03 (in 8.1.0)
-r20: adapt for timelib 2020.03 (in 8.0.10RC1)
-r19: adapt for timelib 2020.02 (in 8.0.0beta2)
-r18: adapt for autotool change in 7.3.3RC1
-r17: adapt for timelib 2018.01 (in 7.3.2RC1)
-r16: adapt for timelib 2017.06 (in 7.2.3RC1)
-r15: adapt for timelib 2017.05beta7 (in 7.2.0RC1)
-r14: improve check for valid tz file
-r13: adapt for upstream changes to use PHP allocator
-r12: adapt for upstream changes for new zic
-r11: use canonical names to avoid more case sensitivity issues
- round lat/long from zone.tab towards zero per builtin db
-r10: make timezone case insensitive
-r9: fix another compile error without --with-system-tzdata configured (Michael Heimpold)
-r8: fix compile error without --with-system-tzdata configured
-r7: improve check for valid timezone id to exclude directories
-r6: fix fd leak in r5, fix country code/BC flag use in
- timezone_identifiers_list() using system db,
- fix use of PECL timezonedb to override system db,
-r5: reverts addition of "System/Localtime" fake tzname.
- updated for 5.3.0, parses zone.tab to pick up mapping between
- timezone name, country code and long/lat coords
-r4: added "System/Localtime" tzname which uses /etc/localtime
-r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
-r2: add filesystem trawl to set up name alias index
-r1: initial revision
----
- ext/date/config0.m4 | 13 ++
- ext/date/lib/parse_tz.c | 535 +++++++++++++++++++++++++++++++++++++++++++++++-
- 2 files changed, 545 insertions(+), 3 deletions(-)
-
---- a/ext/date/config0.m4
-+++ b/ext/date/config0.m4
-@@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h])
- dnl Check for strtoll, atoll
- AC_CHECK_FUNCS(strtoll atoll)
-
-+PHP_ARG_WITH(system-tzdata, for use of system timezone data,
-+[ --with-system-tzdata[=DIR] to specify use of system timezone data],
-+no, no)
-+
-+if test "$PHP_SYSTEM_TZDATA" != "no"; then
-+ AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used])
-+
-+ if test "$PHP_SYSTEM_TZDATA" != "yes"; then
-+ AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
-+ [Define for location of system timezone data])
-+ fi
-+fi
-+
- AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough],
- [PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"],,
- [-Werror])
---- a/ext/date/lib/parse_tz.c
-+++ b/ext/date/lib/parse_tz.c
-@@ -26,9 +26,22 @@
- #include "timelib.h"
- #include "timelib_private.h"
-
-+#ifdef HAVE_SYSTEM_TZDATA
-+#include <sys/mman.h>
-+#include <sys/stat.h>
-+#include <limits.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+
-+#include "php_scandir.h"
-+
-+#else
- #define TIMELIB_SUPPORTS_V2DATA
- #define TIMELIB_SUPPORT_SLIM_FILE
- #include "timezonedb.h"
-+#endif
-+
-+#include <ctype.h>
-
- #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
- # if defined(__LITTLE_ENDIAN__)
-@@ -95,6 +108,11 @@ static int read_php_preamble(const unsig
- {
- uint32_t version;
-
-+ if (memcmp(*tzf, "TZif", 4) == 0) {
-+ *tzf += 20;
-+ return 0;
-+ }
-+
- /* read ID */
- version = (*tzf)[3] - '0';
- *tzf += 4;
-@@ -577,7 +595,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
- }
- }
-
--static int seek_to_tz_position(const unsigned char **tzf, const char *timezone, const timelib_tzdb *tzdb)
-+#ifdef HAVE_SYSTEM_TZDATA
-+
-+#ifdef HAVE_SYSTEM_TZDATA_PREFIX
-+#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX
-+#else
-+#define ZONEINFO_PREFIX "/usr/share/zoneinfo"
-+#endif
-+
-+/* System timezone database pointer. */
-+static const timelib_tzdb *timezonedb_system;
-+
-+/* Hash table entry for the cache of the zone.tab mapping table. */
-+struct location_info {
-+ char code[2];
-+ double latitude, longitude;
-+ char name[64];
-+ char *comment;
-+ struct location_info *next;
-+};
-+
-+/* Cache of zone.tab. */
-+static struct location_info **system_location_table;
-+
-+/* Size of the zone.tab hash table; a random-ish prime big enough to
-+ * prevent too many collisions. */
-+#define LOCINFO_HASH_SIZE (1021)
-+
-+/* Compute a case insensitive hash of str */
-+static uint32_t tz_hash(const char *str)
-+{
-+ const unsigned char *p = (const unsigned char *)str;
-+ uint32_t hash = 5381;
-+ int c;
-+
-+ while ((c = tolower(*p++)) != '\0') {
-+ hash = (hash << 5) ^ hash ^ c;
-+ }
-+
-+ return hash % LOCINFO_HASH_SIZE;
-+}
-+
-+/* Parse an ISO-6709 date as used in zone.tab. Returns end of the
-+ * parsed string on success, or NULL on parse error. On success,
-+ * writes the parsed number to *result. */
-+static char *parse_iso6709(char *p, double *result)
-+{
-+ double v, sign;
-+ char *pend;
-+ size_t len;
-+
-+ if (*p == '+')
-+ sign = 1.0;
-+ else if (*p == '-')
-+ sign = -1.0;
-+ else
-+ return NULL;
-+
-+ p++;
-+ for (pend = p; *pend >= '0' && *pend <= '9'; pend++)
-+ ;;
-+
-+ /* Annoying encoding used by zone.tab has no decimal point, so use
-+ * the length to determine the format:
-+ *
-+ * 4 = DDMM
-+ * 5 = DDDMM
-+ * 6 = DDMMSS
-+ * 7 = DDDMMSS
-+ */
-+ len = pend - p;
-+ if (len < 4 || len > 7) {
-+ return NULL;
-+ }
-+
-+ /* p => [D]DD */
-+ v = (p[0] - '0') * 10.0 + (p[1] - '0');
-+ p += 2;
-+ if (len == 5 || len == 7)
-+ v = v * 10.0 + (*p++ - '0');
-+ /* p => MM[SS] */
-+ v += (10.0 * (p[0] - '0')
-+ + p[1] - '0') / 60.0;
-+ p += 2;
-+ /* p => [SS] */
-+ if (len > 5) {
-+ v += (10.0 * (p[0] - '0')
-+ + p[1] - '0') / 3600.0;
-+ p += 2;
-+ }
-+
-+ /* Round to five decimal place, not because it's a good idea,
-+ * but, because the builtin data uses rounded data, so, match
-+ * that. */
-+ *result = trunc(v * sign * 100000.0) / 100000.0;
-+
-+ return p;
-+}
-+
-+/* This function parses the zone.tab file to build up the mapping of
-+ * timezone to country code and geographic location, and returns a
-+ * hash table. The hash table is indexed by the function:
-+ *
-+ * tz_hash(timezone-name)
-+ */
-+static struct location_info **create_location_table(void)
-+{
-+ struct location_info **li, *i;
-+ char zone_tab[PATH_MAX];
-+ char line[512];
-+ FILE *fp;
-+
-+ strncpy(zone_tab, ZONEINFO_PREFIX "/zone.tab", sizeof zone_tab);
-+
-+ fp = fopen(zone_tab, "r");
-+ if (!fp) {
-+ return NULL;
-+ }
-+
-+ li = calloc(LOCINFO_HASH_SIZE, sizeof *li);
-+
-+ while (fgets(line, sizeof line, fp)) {
-+ char *p = line, *code, *name, *comment;
-+ uint32_t hash;
-+ double latitude, longitude;
-+
-+ while (isspace(*p))
-+ p++;
-+
-+ if (*p == '#' || *p == '\0' || *p == '\n')
-+ continue;
-+
-+ if (!isalpha(p[0]) || !isalpha(p[1]) || p[2] != '\t')
-+ continue;
-+
-+ /* code => AA */
-+ code = p;
-+ p[2] = 0;
-+ p += 3;
-+
-+ /* coords => [+-][D]DDMM[SS][+-][D]DDMM[SS] */
-+ p = parse_iso6709(p, &latitude);
-+ if (!p) {
-+ continue;
-+ }
-+ p = parse_iso6709(p, &longitude);
-+ if (!p) {
-+ continue;
-+ }
-+
-+ if (!p || *p != '\t') {
-+ continue;
-+ }
-+
-+ /* name = string */
-+ name = ++p;
-+ while (*p != '\t' && *p && *p != '\n')
-+ p++;
-+
-+ *p++ = '\0';
-+
-+ /* comment = string */
-+ comment = p;
-+ while (*p != '\t' && *p && *p != '\n')
-+ p++;
-+
-+ if (*p == '\n' || *p == '\t')
-+ *p = '\0';
-+
-+ hash = tz_hash(name);
-+ i = malloc(sizeof *i);
-+ memcpy(i->code, code, 2);
-+ strncpy(i->name, name, sizeof i->name);
-+ i->comment = strdup(comment);
-+ i->longitude = longitude;
-+ i->latitude = latitude;
-+ i->next = li[hash];
-+ li[hash] = i;
-+ /* printf("%s [%u, %f, %f]\n", name, hash, latitude, longitude); */
-+ }
-+
-+ fclose(fp);
-+
-+ return li;
-+}
-+
-+/* Return location info from hash table, using given timezone name.
-+ * Returns NULL if the name could not be found. */
-+const struct location_info *find_zone_info(struct location_info **li,
-+ const char *name)
-+{
-+ uint32_t hash = tz_hash(name);
-+ const struct location_info *l;
-+
-+ if (!li) {
-+ return NULL;
-+ }
-+
-+ for (l = li[hash]; l; l = l->next) {
-+ if (timelib_strcasecmp(l->name, name) == 0)
-+ return l;
-+ }
-+
-+ return NULL;
-+}
-+
-+/* Filter out some non-tzdata files and the posix/right databases, if
-+ * present. */
-+static int index_filter(const struct dirent *ent)
-+{
-+ return strcmp(ent->d_name, ".") != 0
-+ && strcmp(ent->d_name, "..") != 0
-+ && strcmp(ent->d_name, "posix") != 0
-+ && strcmp(ent->d_name, "posixrules") != 0
-+ && strcmp(ent->d_name, "right") != 0
-+ && strstr(ent->d_name, ".list") == NULL
-+ && strstr(ent->d_name, ".tab") == NULL;
-+}
-+
-+static int sysdbcmp(const void *first, const void *second)
-+{
-+ const timelib_tzdb_index_entry *alpha = first, *beta = second;
-+
-+ return timelib_strcasecmp(alpha->id, beta->id);
-+}
-+
-+
-+/* Create the zone identifier index by trawling the filesystem. */
-+static void create_zone_index(timelib_tzdb *db)
-+{
-+ size_t dirstack_size, dirstack_top;
-+ size_t index_size, index_next;
-+ timelib_tzdb_index_entry *db_index;
-+ char **dirstack;
-+
-+ /* LIFO stack to hold directory entries to scan; each slot is a
-+ * directory name relative to the zoneinfo prefix. */
-+ dirstack_size = 32;
-+ dirstack = malloc(dirstack_size * sizeof *dirstack);
-+ dirstack_top = 1;
-+ dirstack[0] = strdup("");
-+
-+ /* Index array. */
-+ index_size = 64;
-+ db_index = malloc(index_size * sizeof *db_index);
-+ index_next = 0;
-+
-+ do {
-+ struct dirent **ents;
-+ char name[PATH_MAX], *top;
-+ int count;
-+
-+ /* Pop the top stack entry, and iterate through its contents. */
-+ top = dirstack[--dirstack_top];
-+ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top);
-+
-+ count = php_scandir(name, &ents, index_filter, php_alphasort);
-+
-+ while (count > 0) {
-+ struct stat st;
-+ const char *leaf = ents[count - 1]->d_name;
-+
-+ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s",
-+ top, leaf);
-+
-+ if (strlen(name) && stat(name, &st) == 0) {
-+ /* Name, relative to the zoneinfo prefix. */
-+ const char *root = top;
-+
-+ if (root[0] == '/') root++;
-+
-+ snprintf(name, sizeof name, "%s%s%s", root,
-+ *root ? "/": "", leaf);
-+
-+ if (S_ISDIR(st.st_mode)) {
-+ if (dirstack_top == dirstack_size) {
-+ dirstack_size *= 2;
-+ dirstack = realloc(dirstack,
-+ dirstack_size * sizeof *dirstack);
-+ }
-+ dirstack[dirstack_top++] = strdup(name);
-+ }
-+ else {
-+ if (index_next == index_size) {
-+ index_size *= 2;
-+ db_index = realloc(db_index,
-+ index_size * sizeof *db_index);
-+ }
-+
-+ db_index[index_next++].id = strdup(name);
-+ }
-+ }
-+
-+ free(ents[--count]);
-+ }
-+
-+ if (count != -1) free(ents);
-+ free(top);
-+ } while (dirstack_top);
-+
-+ qsort(db_index, index_next, sizeof *db_index, sysdbcmp);
-+
-+ db->index = db_index;
-+ db->index_size = index_next;
-+
-+ free(dirstack);
-+}
-+
-+#define FAKE_HEADER "1234\0??\1??"
-+#define FAKE_UTC_POS (7 - 4)
-+
-+/* Create a fake data segment for database 'sysdb'. */
-+static void fake_data_segment(timelib_tzdb *sysdb,
-+ struct location_info **info)
-+{
-+ size_t n;
-+ char *data, *p;
-+
-+ data = malloc(3 * sysdb->index_size + 7);
-+
-+ p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1);
-+
-+ for (n = 0; n < sysdb->index_size; n++) {
-+ const struct location_info *li;
-+ timelib_tzdb_index_entry *ent;
-+
-+ ent = (timelib_tzdb_index_entry *)&sysdb->index[n];
-+
-+ /* Lookup the timezone name in the hash table. */
-+ if (strcmp(ent->id, "UTC") == 0) {
-+ ent->pos = FAKE_UTC_POS;
-+ continue;
-+ }
-+
-+ li = find_zone_info(info, ent->id);
-+ if (li) {
-+ /* If found, append the BC byte and the
-+ * country code; set the position for this
-+ * section of timezone data. */
-+ ent->pos = (p - data) - 4;
-+ *p++ = '\1';
-+ *p++ = li->code[0];
-+ *p++ = li->code[1];
-+ }
-+ else {
-+ /* If not found, the timezone data can
-+ * point at the header. */
-+ ent->pos = 0;
-+ }
-+ }
-+
-+ sysdb->data = (unsigned char *)data;
-+}
-+
-+/* Returns true if the passed-in stat structure describes a
-+ * probably-valid timezone file. */
-+static int is_valid_tzfile(const struct stat *st, int fd)
-+{
-+ if (fd) {
-+ char buf[20];
-+ if (read(fd, buf, 20)!=20) {
-+ return 0;
-+ }
-+ lseek(fd, SEEK_SET, 0);
-+ if (memcmp(buf, "TZif", 4)) {
-+ return 0;
-+ }
-+ }
-+ return S_ISREG(st->st_mode) && st->st_size > 20;
-+}
-+
-+/* To allow timezone names to be used case-insensitively, find the
-+ * canonical name for this timezone, if possible. */
-+static const char *canonical_tzname(const char *timezone)
-+{
-+ if (timezonedb_system) {
-+ timelib_tzdb_index_entry *ent, lookup;
-+
-+ lookup.id = (char *)timezone;
-+
-+ ent = bsearch(&lookup, timezonedb_system->index,
-+ timezonedb_system->index_size, sizeof lookup,
-+ sysdbcmp);
-+ if (ent) {
-+ return ent->id;
-+ }
-+ }
-+
-+ return timezone;
-+}
-+
-+/* Return the mmap()ed tzfile if found, else NULL. On success, the
-+ * length of the mapped data is placed in *length. */
-+static char *map_tzfile(const char *timezone, size_t *length)
-+{
-+ char fname[PATH_MAX];
-+ struct stat st;
-+ char *p;
-+ int fd;
-+
-+ if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) {
-+ return NULL;
-+ }
-+
-+ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", canonical_tzname(timezone));
-+
-+ fd = open(fname, O_RDONLY);
-+ if (fd == -1) {
-+ return NULL;
-+ } else if (fstat(fd, &st) != 0 || !is_valid_tzfile(&st, fd)) {
-+ close(fd);
-+ return NULL;
-+ }
-+
-+ *length = st.st_size;
-+ p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
-+ close(fd);
-+
-+ return p != MAP_FAILED ? p : NULL;
-+}
-+
-+#endif
-+
-+static int inmem_seek_to_tz_position(const unsigned char **tzf, const char *timezone, const timelib_tzdb *tzdb)
- {
- int left = 0, right = tzdb->index_size - 1;
-
-@@ -603,9 +1043,48 @@ static int seek_to_tz_position(const uns
- return 0;
- }
-
-+static int seek_to_tz_position(const unsigned char **tzf, const char *timezone,
-+ char **map, size_t *maplen,
-+ const timelib_tzdb *tzdb)
-+{
-+#ifdef HAVE_SYSTEM_TZDATA
-+ if (tzdb == timezonedb_system) {
-+ char *orig;
-+
-+ orig = map_tzfile(timezone, maplen);
-+ if (orig == NULL) {
-+ return 0;
-+ }
-+
-+ (*tzf) = (unsigned char *)orig;
-+ *map = orig;
-+ return 1;
-+ }
-+ else
-+#endif
-+ {
-+ return inmem_seek_to_tz_position(tzf, timezone, tzdb);
-+ }
-+}
-+
- const timelib_tzdb *timelib_builtin_db(void)
- {
-+#ifdef HAVE_SYSTEM_TZDATA
-+ if (timezonedb_system == NULL) {
-+ timelib_tzdb *tmp = malloc(sizeof *tmp);
-+
-+ tmp->version = "0.system";
-+ tmp->data = NULL;
-+ create_zone_index(tmp);
-+ system_location_table = create_location_table();
-+ fake_data_segment(tmp, system_location_table);
-+ timezonedb_system = tmp;
-+ }
-+
-+ return timezonedb_system;
-+#else
- return &timezonedb_builtin;
-+#endif
- }
-
- const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count)
-@@ -617,7 +1096,30 @@ const timelib_tzdb_index_entry *timelib_
- int timelib_timezone_id_is_valid(const char *timezone, const timelib_tzdb *tzdb)
- {
- const unsigned char *tzf;
-- return (seek_to_tz_position(&tzf, timezone, tzdb));
-+
-+#ifdef HAVE_SYSTEM_TZDATA
-+ if (tzdb == timezonedb_system) {
-+ char fname[PATH_MAX];
-+ struct stat st;
-+
-+ if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) {
-+ return 0;
-+ }
-+
-+ if (system_location_table) {
-+ if (find_zone_info(system_location_table, timezone) != NULL) {
-+ /* found in cache */
-+ return 1;
-+ }
-+ }
-+
-+ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", canonical_tzname(timezone));
-+
-+ return stat(fname, &st) == 0 && is_valid_tzfile(&st, 0);
-+ }
-+#endif
-+
-+ return (inmem_seek_to_tz_position(&tzf, timezone, tzdb));
- }
-
- static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
-@@ -662,6 +1164,8 @@ static timelib_tzinfo* timelib_tzinfo_ct
- timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code)
- {
- const unsigned char *tzf;
-+ char *memmap = NULL;
-+ size_t maplen;
- timelib_tzinfo *tmp;
- int version;
- int transitions_result, types_result;
-@@ -669,7 +1173,7 @@ timelib_tzinfo *timelib_parse_tzfile(con
-
- *error_code = TIMELIB_ERROR_NO_ERROR;
-
-- if (seek_to_tz_position(&tzf, timezone, tzdb)) {
-+ if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) {
- tmp = timelib_tzinfo_ctor(timezone);
-
- version = read_preamble(&tzf, tmp, &type);
-@@ -712,11 +1216,36 @@ timelib_tzinfo *timelib_parse_tzfile(con
- return NULL;
- }
-
-+#ifdef HAVE_SYSTEM_TZDATA
-+ if (memmap) {
-+ const struct location_info *li;
-+
-+ /* TZif-style - grok the location info from the system database,
-+ * if possible. */
-+
-+ if ((li = find_zone_info(system_location_table, timezone)) != NULL) {
-+ tmp->location.comments = timelib_strdup(li->comment);
-+ strncpy(tmp->location.country_code, li->code, 2);
-+ tmp->location.longitude = li->longitude;
-+ tmp->location.latitude = li->latitude;
-+ tmp->bc = 1;
-+ }
-+ else {
-+ set_default_location_and_comments(&tzf, tmp);
-+ }
-+
-+ /* Now done with the mmap segment - discard it. */
-+ munmap(memmap, maplen);
-+ } else {
-+#endif
- if (type == TIMELIB_TZINFO_PHP) {
- read_location(&tzf, tmp);
- } else {
- set_default_location_and_comments(&tzf, tmp);
- }
-+#ifdef HAVE_SYSTEM_TZDATA
-+ }
-+#endif
- } else {
- *error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE;
- tmp = NULL;
--- /dev/null
+Date: Sat, 2 May 2015 10:26:56 +0200
+Subject: Use system timezone
+
+Upstream don't want this patch. See
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=730771 for a summary.
+
+This delta is recovered from previous versions of the system timezone patch in
+Debian, and appears to have inadvertently been dropped. Author unknown.
+
+To be used in tandem with use_embedded_timezonedb.patch and use_embedded_timezonedb_fixes.patch.
+---
+ ext/date/php_date.c | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+--- a/ext/date/php_date.c
++++ b/ext/date/php_date.c
+@@ -566,6 +566,23 @@ static const char* guess_timezone(const
+ } else if (*DATEG(default_timezone)) {
+ return DATEG(default_timezone);
+ }
++ /* Try to guess timezone from system information */
++ {
++ struct tm *ta, tmbuf;
++ time_t the_time;
++ char *tzid = NULL;
++
++ the_time = time(NULL);
++ ta = php_localtime_r(&the_time, &tmbuf);
++ if (ta) {
++ tzid = timelib_timezone_id_from_abbr(ta->tm_zone, ta->tm_gmtoff, ta->tm_isdst);
++ }
++ if (! tzid) {
++ tzid = "UTC";
++ }
++
++ return tzid;
++ }
+ /* Fallback to UTC */
+ return "UTC";
+ }
+++ /dev/null
-Date: Sat, 2 May 2015 10:26:56 +0200
-Subject: Use system timezone
-
-Upstream don't want this patch. See
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=730771 for a summary.
-
-This delta is recovered from previous versions of the system timezone patch in
-Debian, and appears to have inadvertently been dropped. Author unknown.
-
-To be used in tandem with use_embedded_timezonedb.patch and use_embedded_timezonedb_fixes.patch.
----
- ext/date/php_date.c | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
---- a/ext/date/php_date.c
-+++ b/ext/date/php_date.c
-@@ -568,6 +568,23 @@ static const char* guess_timezone(const
- } else if (*DATEG(default_timezone)) {
- return DATEG(default_timezone);
- }
-+ /* Try to guess timezone from system information */
-+ {
-+ struct tm *ta, tmbuf;
-+ time_t the_time;
-+ char *tzid = NULL;
-+
-+ the_time = time(NULL);
-+ ta = php_localtime_r(&the_time, &tmbuf);
-+ if (ta) {
-+ tzid = timelib_timezone_id_from_abbr(ta->tm_zone, ta->tm_gmtoff, ta->tm_isdst);
-+ }
-+ if (! tzid) {
-+ tzid = "UTC";
-+ }
-+
-+ return tzid;
-+ }
- /* Fallback to UTC */
- return "UTC";
- }
--- /dev/null
+Date: Sat, 2 May 2015 10:26:56 +0200
+Subject: php-5.4.9-fixheader
+
+Make generated php_config.h constant across rebuilds.
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1392,8 +1392,8 @@ EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PR
+
+ AC_ARG_VAR([PHP_UNAME],
+ [System information (defaults to the 'uname -a' output)])
+-AS_VAR_IF([PHP_UNAME],, [PHP_UNAME=$(uname -a | xargs)])
+-AC_DEFINE_UNQUOTED([PHP_UNAME], ["$PHP_UNAME"], [The 'uname -a' output.])
++AS_VAR_IF([PHP_UNAME],, [PHP_UNAME=$(uname | xargs)])
++AC_DEFINE_UNQUOTED([PHP_UNAME], ["$PHP_UNAME"], [The 'uname' output.])
+
+ PHP_OS=$(uname | xargs)
+ AC_DEFINE_UNQUOTED([PHP_OS], ["$PHP_OS"], [The 'uname' output.])
+++ /dev/null
-Date: Sat, 2 May 2015 10:26:56 +0200
-Subject: php-5.4.9-fixheader
-
-Make generated php_config.h constant across rebuilds.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1501,7 +1501,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS)
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
- EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
-
--UNAME=`uname -a | xargs`
-+UNAME=`uname | xargs`
- PHP_UNAME=${PHP_UNAME:-$UNAME}
- AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
- PHP_OS=`uname | xargs`
+++ /dev/null
-Date: Wed, 29 Jul 2015 14:37:55 +0200
-Subject: Remove W3C validation icon to not expose the reader's IP address to
- potential tracking.
-
----
- sapi/fpm/status.html.in | 5 -----
- 1 file changed, 5 deletions(-)
-
---- a/sapi/fpm/status.html.in
-+++ b/sapi/fpm/status.html.in
-@@ -70,11 +70,6 @@
- <tr class="h"><th>PID↓</th><th>Start Time</th><th>Start Since</th><th>Requests Served</th><th>Request Duration</th><th>Request method</th><th>Request URI</th><th>Content Length</th><th>User</th><th>Script</th><th>Last Request %CPU</th><th>Last Request Memory</th></tr>
- </table>
- </div>
-- <p>
-- <a href="http://validator.w3.org/check?uri=referer">
-- <img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Transitional" height="31" width="88" />
-- </a>
-- </p>
- <script type="text/javascript">
- <!--
- var xhr_object = null;
--- a/ext/phar/config.m4
+++ b/ext/phar/config.m4
-@@ -19,7 +19,7 @@ if test "$PHP_PHAR" != "no"; then
- fi
- PHP_ADD_EXTENSION_DEP(phar, hash, true)
- PHP_ADD_EXTENSION_DEP(phar, spl, true)
+@@ -30,7 +30,7 @@ if test "$PHP_PHAR" != "no"; then
+
+ PHP_ADD_EXTENSION_DEP(phar, hash)
+ PHP_ADD_EXTENSION_DEP(phar, spl)
- PHP_ADD_MAKEFILE_FRAGMENT
+ #PHP_ADD_MAKEFILE_FRAGMENT
--- a/configure.ac
+++ b/configure.ac
-@@ -1697,13 +1697,13 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)"
+@@ -1585,13 +1585,13 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)"
CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)"
-fi;
+#fi;
- all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd"
+ all_targets="\$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd"
install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $install_pear $pharcmd_install"
--- a/sapi/apache2handler/config.m4
+++ b/sapi/apache2handler/config.m4
-@@ -74,7 +74,7 @@ if test "$PHP_APXS2" != "no"; then
+@@ -79,7 +79,7 @@ if test "$PHP_APXS2" != "no"; then
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
-@@ -152,7 +152,7 @@ AC_DEFUN([PHP_GD_CHECK_FORMAT],[
- LIBS="${LIBS} ${GD_SHARED_LIBADD}"
- old_CFLAGS="${CFLAGS}"
- CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-- AC_MSG_CHECKING([for working gdImageCreateFrom$1 in libgd])
-+ AC_MSG_CHECKING([for gdImageCreateFrom$1 in libgd (OpenWrt build config based)])
- AC_LANG_PUSH([C])
- AC_RUN_IFELSE([AC_LANG_SOURCE([
+@@ -154,7 +154,7 @@ LIBS="${LIBS} ${GD_SHARED_LIBADD}"
+ old_CFLAGS="${CFLAGS}"
+ CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
+ AC_LANG_PUSH([C])
+-AC_CACHE_CHECK([for working gdImageCreateFrom$1 in libgd], [php_var],
++AC_CACHE_CHECK([for working gdImageCreateFrom$1 in libgd (OpenWrt build config based)], [php_var],
+ [AC_RUN_IFELSE([AC_LANG_SOURCE([
#include <stdio.h>
-@@ -179,7 +179,10 @@ int main(int argc, char** argv) {
- ],[
- AC_MSG_RESULT([no])
- ],[
-- AC_MSG_RESULT([no])
-+ AC_MSG_RESULT([$3])
-+ m4_if([$3],[yes],[
-+ AC_DEFINE($2, 1, [Does gdImageCreateFrom$1 work?])
-+ ])
- ])
- AC_LANG_POP([C])
- CFLAGS="${old_CFLAGS}"
-@@ -187,13 +190,14 @@ int main(int argc, char** argv) {
+ #include <unistd.h>
+@@ -177,7 +177,7 @@ int main(int argc, char** argv) {
+ }])],
+ [AS_VAR_SET([php_var], [yes])],
+ [AS_VAR_SET([php_var], [no])],
+- [AS_VAR_SET([php_var], [no])])])
++ [AS_VAR_SET([php_var], [$3])])])
+ AS_VAR_IF([php_var], [yes], [$2])
+ AC_LANG_POP([C])
+ CFLAGS="${old_CFLAGS}"
+@@ -186,13 +186,13 @@ AS_VAR_POPDEF([php_var])
])
AC_DEFUN([PHP_GD_CHECK_VERSION],[
-- PHP_GD_CHECK_FORMAT([Png], [HAVE_GD_PNG])
-- PHP_GD_CHECK_FORMAT([Avif], [HAVE_GD_AVIF])
-- PHP_GD_CHECK_FORMAT([Webp], [HAVE_GD_WEBP])
-- PHP_GD_CHECK_FORMAT([Jpeg], [HAVE_GD_JPG])
-- PHP_GD_CHECK_FORMAT([Xpm], [HAVE_GD_XPM])
-- PHP_GD_CHECK_FORMAT([Bmp], [HAVE_GD_BMP])
-- PHP_GD_CHECK_FORMAT([Tga], [HAVE_GD_TGA])
-+ dnl The 3rd parameter is OpenWrt specific default derived from libgd build
-+ PHP_GD_CHECK_FORMAT([Png], [HAVE_GD_PNG], [yes])
-+ PHP_GD_CHECK_FORMAT([Avif], [HAVE_GD_AVIF], [no])
-+ PHP_GD_CHECK_FORMAT([Webp], [HAVE_GD_WEBP], [yes])
-+ PHP_GD_CHECK_FORMAT([Jpeg], [HAVE_GD_JPG], [yes])
-+ PHP_GD_CHECK_FORMAT([Xpm], [HAVE_GD_XPM], [no])
-+ PHP_GD_CHECK_FORMAT([Bmp], [HAVE_GD_BMP], [no])
-+ PHP_GD_CHECK_FORMAT([Tga], [HAVE_GD_TGA], [no])
- PHP_CHECK_LIBRARY(gd, gdFontCacheShutdown, [AC_DEFINE(HAVE_GD_FREETYPE, 1, [ ])], [], [ $GD_SHARED_LIBADD ])
- PHP_CHECK_LIBRARY(gd, gdVersionString, [AC_DEFINE(HAVE_GD_LIBVERSION, 1, [ ])], [], [ $GD_SHARED_LIBADD ])
- PHP_CHECK_LIBRARY(gd, gdImageGetInterpolationMethod, [AC_DEFINE(HAVE_GD_GET_INTERPOLATION, 1, [ ])], [], [ $GD_SHARED_LIBADD ])
+- PHP_GD_CHECK_FORMAT([Png], [AC_DEFINE([HAVE_GD_PNG], [1])])
+- PHP_GD_CHECK_FORMAT([Avif], [AC_DEFINE([HAVE_GD_AVIF], [1])])
+- PHP_GD_CHECK_FORMAT([Webp], [AC_DEFINE([HAVE_GD_WEBP], [1])])
+- PHP_GD_CHECK_FORMAT([Jpeg], [AC_DEFINE([HAVE_GD_JPG], [1])])
+- PHP_GD_CHECK_FORMAT([Xpm], [AC_DEFINE([HAVE_GD_XPM], [1])])
+- PHP_GD_CHECK_FORMAT([Bmp], [AC_DEFINE([HAVE_GD_BMP], [1])])
+- PHP_GD_CHECK_FORMAT([Tga], [AC_DEFINE([HAVE_GD_TGA], [1])])
++ PHP_GD_CHECK_FORMAT([Png], [AC_DEFINE([HAVE_GD_PNG], [1])], [yes])
++ PHP_GD_CHECK_FORMAT([Avif], [AC_DEFINE([HAVE_GD_AVIF], [1])], [no])
++ PHP_GD_CHECK_FORMAT([Webp], [AC_DEFINE([HAVE_GD_WEBP], [1])], [yes])
++ PHP_GD_CHECK_FORMAT([Jpeg], [AC_DEFINE([HAVE_GD_JPG], [1])], [yes])
++ PHP_GD_CHECK_FORMAT([Xpm], [AC_DEFINE([HAVE_GD_XPM], [1])], [no])
++ PHP_GD_CHECK_FORMAT([Bmp], [AC_DEFINE([HAVE_GD_BMP], [1])], [no])
++ PHP_GD_CHECK_FORMAT([Tga], [AC_DEFINE([HAVE_GD_TGA], [1])], [no])
+ PHP_CHECK_LIBRARY([gd], [gdFontCacheShutdown],
+ [AC_DEFINE([HAVE_GD_FREETYPE], [1])],
+ [],
+++ /dev/null
-From 49627124928f066320b7c2d2ba7501eac5c4fc63 Mon Sep 17 00:00:00 2001
-Date: Mon, 1 Apr 2024 07:16:47 +0000
-Subject: [PATCH] loongarch64 support for fibers
-
-Add loongarch64 assembly files from Boost, needed for fibers support,
-and hook up loongarch64 fibers support during configure.
-
-Close GH-13914
----
- Zend/asm/jump_loongarch64_sysv_elf_gas.S | 121 +++++++++++++++++++++++
- Zend/asm/make_loongarch64_sysv_elf_gas.S | 72 ++++++++++++++
- configure.ac | 2 +
- 3 files changed, 195 insertions(+)
- create mode 100644 Zend/asm/jump_loongarch64_sysv_elf_gas.S
- create mode 100644 Zend/asm/make_loongarch64_sysv_elf_gas.S
-
---- /dev/null
-+++ b/Zend/asm/jump_loongarch64_sysv_elf_gas.S
-@@ -0,0 +1,121 @@
-+/*******************************************************
-+ * *
-+ * ------------------------------------------------- *
-+ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | *
-+ * ------------------------------------------------- *
-+ * | 0 | 8 | 16 | 24 | *
-+ * ------------------------------------------------- *
-+ * | FS0 | FS1 | FS2 | FS3 | *
-+ * ------------------------------------------------- *
-+ * ------------------------------------------------- *
-+ * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | *
-+ * ------------------------------------------------- *
-+ * | 32 | 40 | 48 | 56 | *
-+ * ------------------------------------------------- *
-+ * | FS4 | FS5 | FS6 | FS7 | *
-+ * ------------------------------------------------- *
-+ * ------------------------------------------------- *
-+ * | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | *
-+ * ------------------------------------------------- *
-+ * | 64 | 72 | 80 | 88 | *
-+ * ------------------------------------------------- *
-+ * | S0 | S1 | S2 | S3 | *
-+ * ------------------------------------------------- *
-+ * ------------------------------------------------- *
-+ * | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | *
-+ * ------------------------------------------------- *
-+ * | 96 | 100 | 104 | 108 | 112 | 116 | 120 | 124 | *
-+ * ------------------------------------------------- *
-+ * | S4 | S5 | S6 | S7 | *
-+ * ------------------------------------------------- *
-+ * ------------------------------------------------- *
-+ * | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | *
-+ * ------------------------------------------------- *
-+ * | 128 | 132 | 136 | 140 | 144 | 148 | 152 | 156 | *
-+ * ------------------------------------------------- *
-+ * | S8 | FP | RA | PC | *
-+ * ------------------------------------------------- *
-+ * *
-+ * *****************************************************/
-+
-+.file "jump_loongarch64_sysv_elf_gas.S"
-+.text
-+.globl jump_fcontext
-+.align 2
-+.type jump_fcontext,@function
-+jump_fcontext:
-+ # reserve space on stack
-+ addi.d $sp, $sp, -160
-+
-+ # save fs0 - fs7
-+ fst.d $fs0, $sp, 0
-+ fst.d $fs1, $sp, 8
-+ fst.d $fs2, $sp, 16
-+ fst.d $fs3, $sp, 24
-+ fst.d $fs4, $sp, 32
-+ fst.d $fs5, $sp, 40
-+ fst.d $fs6, $sp, 48
-+ fst.d $fs7, $sp, 56
-+
-+ # save s0 - s8, fp, ra
-+ st.d $s0, $sp, 64
-+ st.d $s1, $sp, 72
-+ st.d $s2, $sp, 80
-+ st.d $s3, $sp, 88
-+ st.d $s4, $sp, 96
-+ st.d $s5, $sp, 104
-+ st.d $s6, $sp, 112
-+ st.d $s7, $sp, 120
-+ st.d $s8, $sp, 128
-+ st.d $fp, $sp, 136
-+ st.d $ra, $sp, 144
-+
-+ # save RA as PC
-+ st.d $ra, $sp, 152
-+
-+ # store SP (pointing to context-data) in A2
-+ move $a2, $sp
-+
-+ # restore SP (pointing to context-data) from A0
-+ move $sp, $a0
-+
-+ # load fs0 - fs7
-+ fld.d $fs0, $sp, 0
-+ fld.d $fs1, $sp, 8
-+ fld.d $fs2, $sp, 16
-+ fld.d $fs3, $sp, 24
-+ fld.d $fs4, $sp, 32
-+ fld.d $fs5, $sp, 40
-+ fld.d $fs6, $sp, 48
-+ fld.d $fs7, $sp, 56
-+
-+ #load s0 - s7
-+ ld.d $s0, $sp, 64
-+ ld.d $s1, $sp, 72
-+ ld.d $s2, $sp, 80
-+ ld.d $s3, $sp, 88
-+ ld.d $s4, $sp, 96
-+ ld.d $s5, $sp, 104
-+ ld.d $s6, $sp, 112
-+ ld.d $s7, $sp, 120
-+ ld.d $s8, $sp, 128
-+ ld.d $fp, $sp, 136
-+ ld.d $ra, $sp, 144
-+
-+ # return transfer_t from jump
-+ # pass transfer_t as first arg in context function
-+ # a0 == FCTX, a1 == DATA
-+ move $a0, $a2
-+
-+ # load PC
-+ ld.d $a2, $sp, 152
-+
-+ # restore stack
-+ addi.d $sp, $sp, 160
-+
-+ # jump to context
-+ jr $a2
-+.size jump_fcontext, .-jump_fcontext
-+
-+/* Mark that we don't need executable stack. */
-+.section .note.GNU-stack,"",%progbits
---- /dev/null
-+++ b/Zend/asm/make_loongarch64_sysv_elf_gas.S
-@@ -0,0 +1,72 @@
-+/*******************************************************
-+ * *
-+ * ------------------------------------------------- *
-+ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | *
-+ * ------------------------------------------------- *
-+ * | 0 | 8 | 16 | 24 | *
-+ * ------------------------------------------------- *
-+ * | FS0 | FS1 | FS2 | FS3 | *
-+ * ------------------------------------------------- *
-+ * ------------------------------------------------- *
-+ * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | *
-+ * ------------------------------------------------- *
-+ * | 32 | 40 | 48 | 56 | *
-+ * ------------------------------------------------- *
-+ * | FS4 | FS5 | FS6 | FS7 | *
-+ * ------------------------------------------------- *
-+ * ------------------------------------------------- *
-+ * | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | *
-+ * ------------------------------------------------- *
-+ * | 64 | 72 | 80 | 88 | *
-+ * ------------------------------------------------- *
-+ * | S0 | S1 | S2 | S3 | *
-+ * ------------------------------------------------- *
-+ * ------------------------------------------------- *
-+ * | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | *
-+ * ------------------------------------------------- *
-+ * | 96 | 100 | 104 | 108 | 112 | 116 | 120 | 124 | *
-+ * ------------------------------------------------- *
-+ * | S4 | S5 | S6 | S7 | *
-+ * ------------------------------------------------- *
-+ * ------------------------------------------------- *
-+ * | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | *
-+ * ------------------------------------------------- *
-+ * | 128 | 132 | 136 | 140 | 144 | 148 | 152 | 156 | *
-+ * ------------------------------------------------- *
-+ * | S8 | FP | RA | PC | *
-+ * ------------------------------------------------- *
-+ * *
-+ * *****************************************************/
-+
-+.file "make_loongarch64_sysv_elf_gas.S"
-+.text
-+.globl make_fcontext
-+.align 2
-+.type make_fcontext,@function
-+make_fcontext:
-+ # shift address in A0 to lower 16 byte boundary
-+ bstrins.d $a0, $zero, 3, 0
-+
-+ # reserve space for context-data on context-stack
-+ addi.d $a0, $a0, -160
-+
-+ # third arg of make_fcontext() == address of context-function
-+ st.d $a2, $a0, 152
-+
-+ # save address of finish as return-address for context-function
-+ # will be entered after context-function returns
-+ la.local $a4, finish
-+ st.d $a4, $a0, 144
-+
-+ # return pointer to context-data
-+ jr $ra
-+
-+finish:
-+ # exit code is zero
-+ li.d $a0, 0
-+ # call _exit(0)
-+ b %plt(_exit)
-+
-+.size make_fcontext, .-make_fcontext
-+/* Mark that we don't need executable stack. */
-+.section .note.GNU-stack,"",%progbits
---- a/configure.ac
-+++ b/configure.ac
-@@ -1281,6 +1281,7 @@ AS_CASE([$host_cpu],
- [ppc*|powerpc*], [fiber_cpu="ppc32"],
- [riscv64*], [fiber_cpu="riscv64"],
- [s390x*], [fiber_cpu="s390x"],
-+ [loongarch64*], [fiber_cpu="loongarch64"],
- [mips64*], [fiber_cpu="mips64"],
- [mips*], [fiber_cpu="mips32"],
- [fiber_cpu="unknown"]
-@@ -1302,6 +1303,7 @@ AS_CASE([$fiber_cpu],
- [ppc32], [fiber_asm_file_prefix="ppc32_sysv"],
- [riscv64], [fiber_asm_file_prefix="riscv64_sysv"],
- [s390x], [fiber_asm_file_prefix="s390x_sysv"],
-+ [loongarch64], [fiber_asm_file_prefix="loongarch64_sysv"],
- [mips64], [fiber_asm_file_prefix="mips64_n64"],
- [mips32], [fiber_asm_file_prefix="mips32_o32"],
- [fiber_asm_file_prefix="unknown"]
--- /dev/null
+--- a/sapi/apache2handler/config.m4
++++ b/sapi/apache2handler/config.m4
+@@ -32,11 +32,11 @@ if test "$PHP_APXS2" != "no"; then
+ fi
+
+ APXS_INCLUDEDIR=$($APXS -q INCLUDEDIR)
+- APXS_HTTPD=$($APXS -q SBINDIR)/$($APXS -q TARGET)
+- AS_IF([test ! -x "$APXS_HTTPD"], [AC_MSG_ERROR(m4_text_wrap([
+- $APXS_HTTPD executable not found. Please, install Apache HTTP Server
+- command-line utility.
+- ]))])
++# APXS_HTTPD=$($APXS -q SBINDIR)/$($APXS -q TARGET)
++# AS_IF([test ! -x "$APXS_HTTPD"], [AC_MSG_ERROR(m4_text_wrap([
++# $APXS_HTTPD executable not found. Please, install Apache HTTP Server
++# command-line utility.
++# ]))])
+
+ APXS_CFLAGS=$($APXS -q CFLAGS)
+ APU_BINDIR=$($APXS -q APU_BINDIR)
+@@ -120,7 +120,8 @@ if test "$PHP_APXS2" != "no"; then
+ -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1
+ ])
+
+- AS_IF([$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes' >/dev/null 2>&1], [
++# AS_IF([$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes' >/dev/null 2>&1], [
++ AS_IF([false], [
+ APACHE_THREADED_MPM=yes
+ enable_zts=yes
+ ], [APACHE_THREADED_MPM=no])
projects / feed / packages.git / commitdiff